From c7225bc8c1e4fa7e37a61480ce8a3e5e47f14856 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 26 Aug 2017 10:58:08 -0400 Subject: [PATCH] scrolled window: Use GdkEvent API --- gtk/gtkscrolledwindow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index ac86c66fb7..a2bfd6c144 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1291,6 +1291,7 @@ captured_event_cb (GtkWidget *widget, gboolean on_scrollbar; GdkEventType event_type; guint state; + GdkCrossingMode mode; sw = GTK_SCROLLED_WINDOW (widget); priv = sw->priv; @@ -1320,6 +1321,7 @@ captured_event_cb (GtkWidget *widget, event_target_ancestor = gtk_widget_get_ancestor (event_target, GTK_TYPE_SCROLLBAR); on_scrollbar = (event_target_ancestor == priv->hindicator.scrollbar || event_target_ancestor == priv->vindicator.scrollbar); + gdk_event_get_crossing_mode (event, &mode); if (event_type == GDK_MOTION_NOTIFY) { @@ -1353,7 +1355,7 @@ captured_event_cb (GtkWidget *widget, } } else if (event_type == GDK_LEAVE_NOTIFY && on_scrollbar && - event->crossing.mode == GDK_CROSSING_UNGRAB) + mode == GDK_CROSSING_UNGRAB) { check_update_scrollbar_proximity (sw, &priv->vindicator, event); check_update_scrollbar_proximity (sw, &priv->hindicator, event); -- 2.30.2